Auto merge of #1111 - alexcrichton:rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 31 Dec 2014 21:39:41 +0000 (21:39 +0000)
committerbors <bors@rust-lang.org>
Wed, 31 Dec 2014 21:39:41 +0000 (21:39 +0000)
commit1a1868b7015e908713dfc99d512bc8058402ff94
treec9ddae3cb15ccdf37eec143a6a6f5d53a03b88e7
parent12782cbdec5a375b636aa25169f599b305d9cd09
parentb9dddc22b1ce386837e5003ff78a6daa75001625
Auto merge of #1111 - alexcrichton:rollup, r=alexcrichton